From 1b0340715dde1dbddc28be6ad00554a6d4c4f7b7 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 9 Feb 2006 17:42:51 +0100 Subject: [PATCH] Don't specify VT console structure at all when specifying !console_use_vt. The dummy_con just confuses the VT implementation and you get no console output without manually specifying a console= boot parameter. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c | 7 ------- linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c | 7 ------- 2 files changed, 14 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c index ce2acff5a1..1b02d51647 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c @@ -1866,13 +1866,6 @@ void __init setup_arch(char **cmdline_p) #endif } else { extern int console_use_vt; -#if defined(CONFIG_VGA_CONSOLE) - /* disable VGA driver */ - ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB; -#endif -#if defined(CONFIG_DUMMY_CONSOLE) - conswitchp = &dummy_con; -#endif console_use_vt = 0; } } diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c index 3f9ea69ce3..7ad9d8a6b9 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c @@ -961,13 +961,6 @@ void __init setup_arch(char **cmdline_p) #endif } else { extern int console_use_vt; -#if defined(CONFIG_VGA_CONSOLE) - /* disable VGA driver */ - ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB; -#endif -#if defined(CONFIG_DUMMY_CONSOLE) - conswitchp = &dummy_con; -#endif console_use_vt = 0; } } -- 2.30.2